bitkeeper revision 1.1159.227.1 (41f530efSmK6bvjzrLTJ-C5-uso9Gw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Mon, 24 Jan 2005 17:31:27 +0000 (17:31 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Mon, 24 Jan 2005 17:31:27 +0000 (17:31 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge